Android Security 11.0.0 Release 74 (10993236)
Merge cherrypicks of ['googleplex-android-review.googlesource.com/23497456'] into security-aosp-rvc-release.

Change-Id: Iceece9a53bf6e37ae0302fd4419ef2abf882f470