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

Change-Id: Ie6fc7f817f7d210bfe52cbc63bfc081e9774ec77