Android security 10.0.0 release 62
Merge cherrypicks of [16101568, 16145003] into security-aosp-qt-release.

Change-Id: Ice8ca8838d3dfc611229e6e52c18b0611e31366c