Android Security 11.0.0 Release 60 (9033583)
Merge cherrypicks of [19085841] into security-aosp-rvc-release.

Change-Id: If7effe6c056bd8a9fec0544c9192acf5474e6dd0