Android CTS 8.1 Release 18 (6141226)
Merge "Make change and version bump to OMC1.200116.001" into oreo-mr1-cts-release