Android CTS 8.1 Release 6 (4799944)
Merge "Snap for 4799797 from c98d5f834eb0d1311c1a5584925920925a9d91ed to oreo-mr1-cts-release" into oreo-mr1-cts-release