Android CTS 9.0 Release 7 (5353853)
Snap for 4706961 from 6f61f19d2970eacbe1c9b24dc71c53dad5756e74 to pi-release

Change-Id: I41ba11443f3583841a19c1fb7517ea500c2bedb7