Android CTS 8.1 Release 18 (6141226)
release-request-e73a0a41-91c3-4249-808e-8d196d54a344-for-git_oc-mr1-release-4273744 snap-temp-L04700000093069831

Change-Id: Iecac22998f2fd8407a4c5dd89382bb3fd152b737