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

Change-Id: Ib9ee674e0797c0f00ba03eea914473900c32e74b