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

Change-Id: Ibd1f4ca14e531679c674eb86cdf424372a11a372