Android security 11.0.0 release 54
Merge cherrypicks of [16487368] into security-aosp-rvc-release.

Change-Id: I8322eb4c1080afd7f14ba5ae37166f7a5966421e