Android CTS 8.0 Release 12 (4890494)
Merge "Snap for 4890207 from 54d41e651ddb9f6a7bde9123976bedc06775b1ec to oreo-cts-release" into oreo-cts-release