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

Change-Id: Ifa5163dfa822e6be4363b6277944a38d7a4e00fa