Android VTS 9.0 Release 9 (5512091)
Snap for 4818534 from aa0f23c1924e18d0a408d90e02f0c22e2343814f to pi-release

Change-Id: Ic3be7efd12ded8d96faab1a0644f58413804669c