Android 8.0.0 release 31
release-request-49d3fda6-f7aa-4b8d-aeeb-eed9adb96e3c-for-git_oc-release-4053943 snap-temp-L63500000069017893

Change-Id: I6519a71833eac23497f744a8a02cb3d5583739d7