Android CTS 8.0 Release 6 (4591581)
Merge "Snap for 4444158 from bafd066662b743895483c9e87cb064113f591e24 to oreo-cts-release" into oreo-cts-release