Android CTS 8.0 Release 4 (4452367)
Merge "Snap for 4444158 from 8f696ee31a1fa0afd3accb1000f490573b4cd71c to oreo-cts-release" into oreo-cts-release