Android VTS 9.0 Release 6 (5264840)
Snap for 4824048 from e448ccc3c752877411396b445080c85fee8fba62 to pi-release

Change-Id: Ib5c7558b425624d476eeddbde5af4c8bfb3375b5