Android security 11.0.0 release 61
Merge cherrypicks of [19322655, 19868399] into security-aosp-rvc-release.

Change-Id: I6de9285d94f4399d72dcda96929dd0d5b89ca72d