Android CTS 8.1 Release 12 (5131724)
Merge "Make change and version bump to OMC1.181114.001" into oreo-mr1-cts-release