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