Bug: 8790775 Merge of https://widevine-internal-review.googlesource.com/#/c/5381/ from the Widevine CDM repository. Change-Id: I749303eee8162f37982f6dd5d83b6cf254b96847
Bug: 8790775 Merge of https://widevine-internal-review.googlesource.com/#/c/5381/ from the Widevine CDM repository. Change-Id: I749303eee8162f37982f6dd5d83b6cf254b96847