Android 8.0.0 release 31
release-request-49e3b466-076f-42b5-804c-ed9aab783aec-for-git_oc-r5-release-4255676 snap-temp-L37500000092850661

Change-Id: I6e1f94259ac764c17ba4f89878151526b6c98ee5