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