Android VTS 8.0 Release 8 (4744587)
Merge "Snap for 4455664 from a8c6307fae854e21a66498aa3c1badd717ea375f to oreo-vts-release" into oreo-vts-release