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

Change-Id: Ic56e16a7f15173df72615264244cbbf91ee544b3