Does not affect any production code, only unit tests Makes the end-to-end license/decrypt test compatible with the fix for b/8604068 (merged). related-to-bug: 8604068 Merge of https://widevine-internal-review.googlesource.com/#/c/4982/ from widevine cdm repository to android repository. Change-Id: Ic5739c9de0cd385a672311ec87b9a475e367121a