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