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