Android CTS 8.1 Release 22 (7116318)
Merge "Make change and version bump to OMC1.210201.001" into oreo-mr1-cts-release