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

Change-Id: If52fa6dacdd81acbf237d9a263d9641bcbd9f6e0