Android VTS 9.0 Release 6 (5264840)
Snap for 4612226 from ccf18e064e312377067bdfea746ec85f8375f19a to pi-release

Change-Id: I15a11bf4a170dda7e6f7b02416f382f07460cdd0