Android security 11.0.0 release 61
Merge cherrypicks of [19693677] into security-aosp-rvc-release.

Change-Id: If18ba75250d79d8cd97c785377430f3e6c94d933