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