Android security 11.0.0 release 71
Merge cherrypicks of ['googleplex-android-review.googlesource.com/23914014'] into security-aosp-rvc-release.

Change-Id: Ie44c9fe2294e167589443f02977d575cecf5a98f