Android 9.0.0 release 22
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCXBBLHAAKCRDorT+BmrEO
eDoZAJ43xav+I4XZLmRWiX52apvTiFMRbgCghmNy85S0nbmNAGnMdLFJxuT0tRE=
=OQ7g
-----END PGP SIGNATURE-----
Manually merge changes from giant AOSP topic

Change-Id: Ibe89bbd57fa3c437c0e104c6590e9b5c9ab25ef0