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

Change-Id: I805cb985ac5bc9af8709df3e06c402bca2e642e7