Android CTS 8.0 Release 20 (5730326)
Merge "Snap for 4444158 from 6adb8973e1bea0f803f73c21aaaa777b2e71d7b2 to oreo-cts-release" into oreo-cts-release