Android CTS 8.1 Release 9 (4983507)
Merge "Snap for 4726689 from af8d1aa02b1148bb5ec05f33bf7914937a3152c1 to oreo-mr1-cts-release" into oreo-mr1-cts-release