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

Change-Id: Icb4557971d5279e168c7c4ef5f8274af9ac4537f