Android CTS 8.1 Release 7 (4855739)
Merge "Merge cherrypicks of [708444] into oreo-mr1-cts-release" into oreo-mr1-cts-release