Android CTS 8.0 Release 23 (6381565)
Merge "Snap for 6345417 from ffb9d2965755167befff1653c4891f92dfea8267 to oreo-cts-release" into oreo-cts-release