Android CTS 8.1 Release 4 (4666912)
Merge "Version bump to OMC1.180320.001" into oreo-mr1-cts-release