Android security 10.0.0 release 64
Merge cherrypicks of [16187628] into security-aosp-qt-release.

Change-Id: Ice52440cd33a5e9e081da9962c61750bd53a82c8