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