Android CTS 8.1 Release 17 (5933254)
Merge "Snap for 4726689 from 87d12ea5e997a12c9edd5139082aec0feacacb27 to oreo-mr1-cts-release" into oreo-mr1-cts-release