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