Android 8.1.0 release 21
release-request-b6f2d5b3-a3d6-410f-b58f-c85ba8187177-for-git_oc-mr1-release-4173087 snap-temp-L93200000081515229

Change-Id: I9b6c5be6e005708df9a431681266ee7086c68c64