Android CTS 11.0 Release 1 (RP1A.200720.010)
Merge stage-aosp-master into pi-dev-plus-aosp
am: c123000255

Change-Id: Iacfaa07dbe89bc5c711e05385af68538dfed1842