Merged from https://widevine-internal-review.googlesource.com/164120 Based on review comment in PS10 of http://go/ag/20608670 Bug: 262797186 Test: GtsMediaTestCases Change-Id: Ia54117ffd0882de161e772fc1ca180a8d3f27480
Merged from https://widevine-internal-review.googlesource.com/164120 Based on review comment in PS10 of http://go/ag/20608670 Bug: 262797186 Test: GtsMediaTestCases Change-Id: Ia54117ffd0882de161e772fc1ca180a8d3f27480