Android 9.0.0 Release 36 (PQ3A.190505.001)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCXNCYBwAKCRDorT+BmrEO
ePwfAKCEwOsWHGP7WTYG+p1KE2fJHA4CWACeIJpscLSPPvpD9UFZ59FdDCHBVsQ=
=1wGH
-----END PGP SIGNATURE-----
Manually merge changes from giant AOSP topic

Change-Id: Ibe89bbd57fa3c437c0e104c6590e9b5c9ab25ef0