Android CTS 8.1 Release 10 (5009339)
Merge "Snap for 5009057 from 7692d04b249f2418cac2bc61e1a3e9273c7a932f to oreo-mr1-cts-release" into oreo-mr1-cts-release