Android Security 11.0.0 Release 74 (10993236)
Merge cherrypicks of [18168007] into security-aosp-rvc-release.

Change-Id: I0054af621f908fac44c6e888ac26245e472a352a