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