Android CTS 8.0 Release 12 (4890494)
Merge "Snap for 4444158 from 98eb9ac60a5498e30bd543c1f011bf34091dc99f to oreo-cts-release" into oreo-cts-release