Android CTS 9.0 Release 2 (4999451)
Snap for 4620899 from ce43588700ff84f20b6bf6a513d8932f693e33dd to pi-release

Change-Id: I3d3e68045925d0e9bb805fc33ef196c9f220929c