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

Change-Id: I7b1e0596b64de9a7127290f44bdd4608e5746be3