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