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

Change-Id: I6ac42e7f7e0f765de5e378fe999da5fd6477386e