Android security 11.0.0 release 49
Merge cherrypicks of [15587962] into security-aosp-rvc-release

Change-Id: I888b86517cd67d96821fb84822c049e51fb90cd8