Android CTS 8.0 Release 20 (5730326)
Merge "Make change and version bump to OCR1.190715.001" into oreo-cts-release