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

Change-Id: I07f5be75471bdc5ff53cc0872d9d58dfcf2cc2c5