Android CTS 8.1 Release 20 (6676678)
Merge "Make change and version bump to OMC1.200713.001" into oreo-mr1-cts-release