Android CTS 8.1 Release 5 (4726866)
Merge "Make change and version bump to OMC1.180417.001" into oreo-mr1-cts-release