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