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

Change-Id: I196145578b7b7e74534285a275ba64dffe613e82