Android CTS 8.1 Release 24 (7550654)
Merge "Make change and version bump to OMC1.210714.001" into oreo-mr1-cts-release