Merge from Widevine repo of https://widevine-internal-review.git.corp.google.com/c/cdm/+/95206 Only one file is affected in Android repo. Bug: 149050172 Test: Unit tests Change-Id: I3251b9997733e59b18c0b5727205067dcc3a963c
Merge from Widevine repo of https://widevine-internal-review.git.corp.google.com/c/cdm/+/95206 Only one file is affected in Android repo. Bug: 149050172 Test: Unit tests Change-Id: I3251b9997733e59b18c0b5727205067dcc3a963c