Android CTS 8.1 Release 18 (6141226)
Merge "Snap for 4726689 from 47a82ba91ff281a8afe975f03eba2acb9b1bb74c to oreo-mr1-cts-release" into oreo-mr1-cts-release