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

Change-Id: Iefd898e946d3098dda8a37d0f6148e88517e29d6