[ Merge of http://go/wvgerrit/49402 ] Bug: 78912546 Test: WV unit/integration tests, GtsMediaTestCases, Aupt tests Change-Id: Ic2016e8b557cd2dd45d5d3bbaa28be16e58dab8b