Android CTS 9.0 Release 3 (5016358)
Snap for 4736748 from f9b4ed978a24aa01cb4ed9f41507d035e14260a9 to pi-release

Change-Id: Icc1e4d07f92fd5673cb6b590245271419e077ae6