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

iEYEABECAAYFAloAq8MACgkQ6K0/gZqxDnjYgQCfVhJZLfzumzmfTsbdIizNRE1D
y1YAn2FubepDM9yJu0hb7Lc9Mbf4m7l5
=loYE
-----END PGP SIGNATURE-----
Merge cherrypicks of [2805728, 2805966] into oc-r5-release

Change-Id: I448e262d28436d256d901d86f9acc3549a6cc9c9