bug: 8584241 Merge of https://widevine-internal-review.googlesource.com/#/c/5280/ from Widevine CDM repository Change-Id: I3596e41a67df44e25c9b31c4c16d4c3d9b7ad92a
bug: 8584241 Merge of https://widevine-internal-review.googlesource.com/#/c/5280/ from Widevine CDM repository Change-Id: I3596e41a67df44e25c9b31c4c16d4c3d9b7ad92a