Android CTS 8.0 Release 25 (6952894)
Merge "Merge cherrypicks of [1487446] into oreo-cts-release" into oreo-cts-release