Android Security 10.0.0 Release 73 (9269285)
Merge cherrypicks of [20404106, 20406267] into security-aosp-qt-release.

Change-Id: I7b5dd25e07197842e232769dd8b3f8b2d17053c2