Android security 11.0.0 release 51
Merge cherrypicks of [16406578] into security-aosp-rvc-release.

Change-Id: I573aca95e81458df390db2a072061ae2731f53e0