Android VTS 9.0 Release 9 (5512091)
Snap for 4605948 from 8b7d861c8f24d61964d18f20e4d0760e1937b0ef to pi-release

Change-Id: I1866d2ca15547de6a4724717afbe08b26c196040