Android security 11.0.0 release 67
Merge cherrypicks of [19734280] into security-aosp-rvc-release.

Change-Id: Ied680686a48164aee1bafa8713688d6f5ab375f0