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

Change-Id: Id560de6c675dde26cc47f5d88d35746380654f95