Android CTS 8.1 Release 20 (6676678)
Merge "Snap for 4526935 from cc42f1d40bcd3af9819af7197454e9329aec930f to oreo-mr1-cts-release" into oreo-mr1-cts-release