Android VTS 8.0 Release 9 (4990514)
Merge "Snap for 4857239 from c333235b06c7eec59d6a0d673105b63d77176dfa to oreo-vts-release" into oreo-vts-release