Android VTS 8.0 Release 9 (4990514)
Merge "Snap for 4857239 from a040fada595726f6d047169599b1ae694baca77d to oreo-vts-release" into oreo-vts-release