Android security 11.0.0 release 65
Merge cherrypicks of ['ag/20641138', 'ag/20871685'] into security-aosp-rvc-release.

Change-Id: Iffbc6a2ad8ddbe8180f34ec2c2bfab3deb551091