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

Change-Id: I5a80b96280cb6c58c783bd38555bbe0d5e61790f