Android 8.1.0 release 21
release-request-d9dc98f7-19b2-484c-b4d1-f35dc43e9c05-for-git_oc-mr1-release-4152006 snap-temp-L91700000079405440

Change-Id: Icfa9484abc982fe0db16c631a5f46c5df5fd24d0