Android security 10.0.0 release 62
Merge cherrypicks of [16199731] into security-aosp-qt-release.

Change-Id: I42406fe5dde729599ff014fdba2af1ac6e931adb