[ Merge of http://go/wvgerrit/103243 ] Include review comments from wv gerrit CL. Bug: 161551490 Test: WV unit integration tests, GtsMediaTestCases and WidevineConcurrentDrmCertificatesTest#testConcurrentDrmCertificates, MediaDrmTest#testMultipleLoadKeys on a redfin Change-Id: Ie9b41a2e68b95692f9353578f6955637411d4dfc