Android CTS 8.1 Release 17 (5933254)
Merge "Snap for 5918762 from 1111e06ee795b78c4edc79051a52a34aa97b1cd6 to oreo-mr1-cts-release" into oreo-mr1-cts-release