Android security 11.0.0 release 63
Merge cherrypicks of [20293997] into security-aosp-rvc-release.

Change-Id: Icda65eee458f1296fd320f60a7e38f67c09e318e