[ Merge of http://go/wvgerrit/167529 ] [ PoC http://ag/21900113 ] Bug: 258188673 Test: sts-tradefed run sts-dynamic-develop -m StsHostTestCases \ -t android.security.sts.Bug_258188673 Test: GtsMediaTestCases Change-Id: If71a0e7a81f376cf28688a590b6cb9dcea699545 Merged-In: If71a0e7a81f376cf28688a590b6cb9dcea699545