Android 8.0.0 release 21
release-request-319cd093-b0d8-4b32-b6ef-e921d10edf73-for-git_oc-dr1-release-4012016 snap-temp-L54300000064339674

Change-Id: Ifcd2c8e2bfa3fca25e20178389e633c3337dbb6c