Android VTS 11.0 Release 1 (RP1A.200720.010)
[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
am: f8d57b52eb -s ours
am skip reason: subject contains skip directive

Change-Id: Iebb674a3823e159224c5024fd5d633b6c200c8b0