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

Change-Id: Ia0ea9164ba446225a36302a9b08758a3027ee074