Android CTS 8.1 Release 21 (6952965)
Merge "Snap for 6667372 from 7c2d068af6e48e4180d36c65b76c4d36868eae13 to oreo-mr1-cts-release" into oreo-mr1-cts-release