Android CTS 9.0 Release 3 (5016358)
Snap for 4728508 from d84a3e4947a7c05f60bce50f16d4fb76f976a1cc to pi-release

Change-Id: Ib07a063d4bbba07b2e860e1580cbacc350fe1a02