Android security 11.0.0 release 63
Merge cherrypicks of [19430798, 19755176] into security-aosp-rvc-release.

Change-Id: Ib7e36844c7226e405013e562f84e9caadb55373f