Android CTS 9.0 Release 12 (6483344)
Snap for 4818534 from 902d1ae6a3d17f2891b4cddf42d0f8128add8bb0 to pi-release

Change-Id: I2c85cc30cc57deebcd77d54a9fdce4c38c8641bc