Android VTS 8.1 Release 4 (4766758)
Merge "Snap for 4711598 from 9d66948caaf607cca2d5631b80de813e241953a8 to oreo-mr1-vts-release" into oreo-mr1-vts-release