Android security 10.0.0 release 74
Merge cherrypicks of [18291819] into security-aosp-qt-release.

Change-Id: Ie31f193844d714b0564697b88a2c571637669905