Android CTS 9.0 Release 2 (4999451)
Snap for 4826885 from a01fa66596f9e7bb304e2c8f388180c78108a6cf to pi-release

Change-Id: Idc8fce7e9ca4f6b205a2b3ad47a525c6792bee40