Android 8.0.0 release 31
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iEYEABECAAYFAloAq8IACgkQ6K0/gZqxDngRcQCeJQPMGGMQSS4WrPbEO5mcwLBP
88wAniRpPZktfl9zXam6UnTrT9hI7+kO
=1kWV
-----END PGP SIGNATURE-----
Merge cherrypicks of [3074544] into oc-r5-release

Change-Id: I93fb68464534882902eaae6fe3c16e8a796ba5ef