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