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

Change-Id: I6ab94aa7a1105ce299ebd2a84dacd02f27bff721