Android CTS 8.1 Release 4 (4666912)
Merge "Snap for 4564838 from e1d35d1a3ed43de63ea3850dad0d8263ae49d01b to oreo-mr1-cts-release" into oreo-mr1-cts-release