Android CTS 8.1 Release 21 (6952965)
Merge "Version bump to OMC1.201013.002 [core/build_id.mk]" into oreo-mr1-cts-release