Android VTS 9.0 Release 5 (5140538)
Snap for 4821244 from 8c892903f8eac55db45cdbf232ec7c2bc697ff48 to pi-release

Change-Id: Ib5920f8b5e1cbb9012b5cbb82c6cd6123da4ca37