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