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