Android security 11.0.0 release 54
Merge cherrypicks of [16243879, 16199369, 16199730, 16554823] into security-aosp-rvc-release.

Change-Id: I4e0f766cc4f6e6c846c11c4d170dd424c8614980