Android VTS 8.0 Release 8 (4744587)
Merge "Snap for 4596917 from 4f8fe64ad51d0e93245bfb606825cdc57ead40dc to oreo-vts-release" into oreo-vts-release