Merge from Widevine repo of http://go/wvgerrit/50481 Original CL http://go/wvgerrit/47520 The original CL was not completely merged to master on Android, so this CL only reverts the left-over bits. The original fix was not sufficient to address all race conditions. A subsequent CL will address them. Bug: 73781703 Bug: 79158083 Bug: 79262108 Test: tested as part of http://go/ag/4674759 Change-Id: Ib6c55ab5434e08fe61e0f65623ac8c7b2dc5aaa1