Android Security 11.0.0 Release 52 (8042688)
Merge cherrypicks of [15159947] into security-aosp-rvc-release

Change-Id: I38d944424aecdb4446c1585d05ae2b641d8b8b4d