Android security 10.0.0 release 72
Merge cherrypicks of [19300198, 19748788] into security-aosp-qt-release.

Change-Id: I3c281933c4dfd866597b1b981478bcf31a0389cf