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

Change-Id: I19b9cb7ff62851e4ef2e9c4a108f766456ec030c