Android CTS 9.0 Release 20 (8503603)
Snap for 4832339 from ab25ab9cb72857fac6e74dd0dec2a00ea7885a91 to pi-release

Change-Id: Id9730a3e18191957743a98a5ae32c6a44ef39a1b