Android CTS 8.0 Release 10 (4800267)
Merge "Snap for 4794370 from dd3690308c8f9a837f7e7a7b6ea5663a45e7491b to oreo-cts-release" into oreo-cts-release