Android security 11.0.0 release 75
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24872615', 'googleplex-android-review.googlesource.com/25096450'] into security-aosp-rvc-release.

Change-Id: If3462e17dc871780ce9afd419c82154ab56498f3