Android CTS 9.0 Release 3 (5016358)
Snap for 4826885 from bc9623224df70c012f0a226875a8c7c6479f777f to pi-release

Change-Id: I8524016813061998c7a0b33ab068e049d792fc98