Android 8.1.0 release 31
release-request-80d7cd88-53c4-4e65-952a-f34bc86a0841-for-git_oc-mr1-release-4050000 snap-temp-L22200000068540971

Change-Id: I9dd985dfdcc340987f2c8a01e0658ddd3fdb8f65