Android security 10.0.0 release 65
Merge cherrypicks of [16621952, 16743244] into security-aosp-qt-release.

Change-Id: I1b6582710ba2a0b7aede0d0659c17d7b32f64e93