Merged from go/wvgerrit/178231 Bug: 290252845 Test: WVTS tests seem to be running and passing Change-Id: Ifff9123a73e173e835a6e89ba7c2760e1cd500fd (cherry picked from commit 6889845d2e7e24f22c00b333335c34259b3fc96e)
Merge from Widevine repo of http://go/wvgerrit/169061 Bug: 253779846 Merged from https://widevine-internal-review.googlesource.com/167477 Change-Id: I6046e59449700c8be05641f71dcbb2bba6ce493b