bug: 8790775 Merge of https://widevine-internal-review.googlesource.com/#/c/5510/ from Widevine CDM repository Change-Id: I7d040fcebdea7f038352bd4216dcbaab4ff9401c
bug: 8790775 Merge of https://widevine-internal-review.googlesource.com/#/c/5510/ from Widevine CDM repository Change-Id: I7d040fcebdea7f038352bd4216dcbaab4ff9401c