Android 10.0.0 release 21
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCXhOC7AAKCRDorT+BmrEO
eK44AJ4/qEprCX9s237fOPQbwKQxvzaL7QCfa7PfIhP/YbGUS/RVjYW9h9fl4Ws=
=W7Kl
-----END PGP SIGNATURE-----
Merge master@5433138 into git_qt-dev-plus-aosp.
am: 655c904073

Change-Id: I0c84868118e8c01d49c7464bdda4b72c39121dff