Android CTS 8.0 Release 8 (4666824)
Merge "Snap for 4666545 from d1cc1c0a9a343a54e0e01949d8f996b1b90356c1 to oreo-cts-release" into oreo-cts-release