Android CTS 8.0 Release 24 (6676658)
Merge "Snap for 4416925 from f5e4cdca6dbad04ebff46e6d4b8e0c96969c199d to oreo-cts-release" into oreo-cts-release