Android CTS 8.0 Release 24 (6676658)
Merge "Snap for 6667347 from 6d7a838f06d60bddefdf7e623a820885dae70499 to oreo-cts-release" into oreo-cts-release