Android VTS 8.0 Release 10 (5333033)
Merge "Snap for 4455664 from fc997418128b95633d339e4563554994f4d7fdd7 to oreo-vts-release" into oreo-vts-release