Android CTS 9.0 Release 3 (5016358)
Snap for 4402171 from 68ce780a284aa7e16a1f44e3ed1c81d3135642ec to pi-release

Change-Id: I105e59e8dd233b787e8615746ad6af7073604bd7