Android security 10.0.0 release 72
Merge cherrypicks of [19667859] into security-aosp-qt-release.

Change-Id: I6e31ed0b643e041658ebfa34c643c0b3145e467d