Android Security 10.0.0 Release 69 (8712615)
Merge cherrypicks of [18492389] into security-aosp-qt-release.

Change-Id: Iaa53cbd9ef2fb8114b32eb9e6640e1a5a1d747da