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

Change-Id: I6ccf5a2187fd42e9f9e45d394683e5b319590838