Android security 10.0.0 release 68
Merge cherrypicks of [17034408] into security-aosp-qt-release.

Change-Id: I05afd15928ce26853c64464c999908e63ac817eb