Merge from Widevine repo of http://go/wvgerrit/53160 Note: WVDrmPlugin.cpp was already modified in http://go/ag/3995618 Test: tested as part of http://go/ag/4674759 Change-Id: I12d00b73bec140412615f1f843d20b375ba93fa3