Android Security 11.0.0 Release 52 (8042688)
Merge cherrypicks of [15718931, 15718932, 16248754] into security-aosp-rvc-release.

Change-Id: If9648b83f25a48d5e3ae15723df153f84e5c230d