Merge from Widevine repo of http://go/wvgerrit/158251 The cherry pick of http://go/wvgerrit/157958 was not complete. Bug: 251827716 Test: tested with http://go/ag/20420224 Change-Id: Icd4d2f23003ab621bf690ca3dcf1de2f0c5afc45
Merge from Widevine repo of http://go/wvgerrit/158251 The cherry pick of http://go/wvgerrit/157958 was not complete. Bug: 251827716 Test: tested with http://go/ag/20420224 Change-Id: Icd4d2f23003ab621bf690ca3dcf1de2f0c5afc45