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

Change-Id: I1b29319fffe87bd6d6e0b6ae2c0c64e86bac703f