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 of http://go/wvgerrit/93404 This CL updates the Widevine CDM to support OEMCrypto v16.1 Test: Tested in 16.2 CL Bug: 141247171 Change-Id: I69bd993500f6fb63bf6010c8b0250dc7acc3d71b