Android VTS 8.0 Release 7 (4571885)
Merge "Snap for 4561250 from d7ab0877dc2ae2b60b1c1c0733823f58ac4de351 to oreo-vts-release" into oreo-vts-release