Android 10.0.0 release 23
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCXhOD6wAKCRDorT+BmrEO
eIqIAJ9mMnv7X3tFL13ypW3qpEeWSFRyZgCdFY5yDMl01G8uLMJBJ+tExhexoFE=
=3TPk
-----END PGP SIGNATURE-----
Merge cherrypicks of [9542567, 9542568] into qt-qpr1-b-release

Change-Id: I7368736ddf15b0b1618ffc536dda3990273f3ee3