Android CTS 9.0 Release 3 (5016358)
Snap for 4683893 from 9c50b5e176b95034b54d04856388ac3be6132076 to pi-release

Change-Id: I37daa5f4452442119a1582626c183326281ed0ea