Android CTS 9.0 Release 5 (5131725)
Snap for 4455093 from f867c52e6ee1fb0dde495f79352928e1cd1314e6 to pi-release

Change-Id: Ib77302fe651665324087444bd17ef7fdc8c2999e