Android 8.1.0 release 21
release-request-bd6aa7dd-7b02-4794-942c-14599bf61208-for-git_oc-mr1-release-4193791 snap-temp-L98700000083613807

Change-Id: I7b91991145571c4e201dee677159edc491c06a0d