Android CTS 9.0 Release 2 (4999451)
Snap for 4667902 from 985548d9a7de8cde72ea0b5a81f6f0854d049454 to pi-release

Change-Id: Id6d0019fdc494019a23ee520e9ca2fe30ed31827