Android Security 11.0.0 Release 58 (8712617)
Merge cherrypicks of [18492389] into security-aosp-rvc-release.

Change-Id: I34c01c4017907358b3833efaed96e711e64b7ec4