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