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

Change-Id: I0f6304a60a0fabbda2fa152d9733f6301bbfcff5