Android VTS 8.0 Release 11 (5405812)
Merge "Snap for 4455664 from 8d1bba5bee354658d9c68744795bb7983986e444 to oreo-vts-release" into oreo-vts-release