Android VTS 8.0 Release 6 (OVS1.171207.001)
Merge "Snap for 4455664 from 6f1e9b8983e9c07c94b417a7c5277561cc91165f to oreo-vts-release" into oreo-vts-release