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

Change-Id: Icb337f771afe13bfe12d78f4c1e4b2d83f4ba2d5