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