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

Change-Id: If18df811f47dabb4cecb03edb2c3d7e99bde7bbf