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

Change-Id: I7a3f58cc4c3996b8ef1d3a77f0d9433124841675