Merge from Widevine repo of http://go/wvgerrit/47540 Bug: 77364593 Test: tested as part of http://go/ag/4674759 Change-Id: If1063d410153eb49584c94156e2d98af9e08c060