Merged from http://go/wvgerrit/163817
Based on review comment in PS10 of http://go/ag/ag/20608670
Test: Google TV
Test: atest MediaDrmParameterizedTests
Test: atest DrmSessionManagerTest
Bug: 262797186
Change-Id: I28ed90255df1a16fb252000f8a8a0f89246563c3