Android security 10.0.0 release 65
Merge cherrypicks of [16223627] into security-aosp-qt-release.

Change-Id: I39aff0d340abf2a1100f293e68c54b1b28fcf62a