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

Change-Id: I4add2d629e9cead48908bd4fbc96bce2bc82dd29