Android VTS 8.0 Release 9 (4990514)
Merge "Snap for 4455664 from 23dc48e00fcc9cce7569f8f0ff3ff713ca4b4e69 to oreo-vts-release" into oreo-vts-release