Android security 10.0.0 release 74
Merge cherrypicks of [19430798, 19755176] into security-aosp-qt-release.

Change-Id: I85b9cdd795a81742f258d4989e8cf032067f7f6a