Android VTS 8.1 Release 7 (5335206)
Merge "Snap for 5029157 from fed6186c743607d4c2696cc27385a31567f63185 to oreo-mr1-vts-release" into oreo-mr1-vts-release