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