Android 8.0.0 release 31
release-request-276f9f52-87fd-4915-bd79-9a2f0ee77433-for-git_oc-release-4090213 snap-temp-L31600000073091223

Change-Id: I9888956d3dbb66f8de012ef2e61395075ff4fa72