Android 8.0.0 release 31
release-request-60f55d52-4657-4714-89dc-b6443475d767-for-git_oc-release-4022373 snap-temp-L45500000065414617

Change-Id: I30862b6e3c7590389181762334ea2d7887f14355