Android CTS 9.0 Release 3 (5016358)
Snap for 4612226 from 181b44b0422f2ca9a844a39f0b7e7f20c2712b72 to pi-release

Change-Id: I34fa6b747bed1710629d53da59264b179578b90a