Android CTS 9.0 Release 4 (5106607)
Snap for 4693621 from 0f6d776dddcf75046e6a28f2945b70c77c808459 to pi-release

Change-Id: I2fb8ab457184739416cf55dcd457a5b6eeb035a7