Android VTS 11.0 Release 1 (RP1A.200720.010)
Merge cherrypicks of [12196470, 12196437] into rvc-release

Change-Id: Id3eaf393b9aa384a9de4a326634848d359d5f93f