Android CTS 8.1 Release 2 (4602824)
Merge "Snap for 4526935 from df0b5eed48a59c6f4f86b082352a957e0e6610ba to oreo-mr1-cts-release" into oreo-mr1-cts-release