Android mainline 10.0.0 release 4
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCXeV/+QAKCRDorT+BmrEO
eGjPAJ9hU5Wg4IGYQA6r8+64wu9YM0FCbwCcCOlispwr5r2P8I4LbYqroGai+Lw=
=Ryau
-----END PGP SIGNATURE-----
Merge master@5433138 into git_qt-dev-plus-aosp.
am: 655c904073

Change-Id: I0c84868118e8c01d49c7464bdda4b72c39121dff