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