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

Change-Id: I38d944424aecdb4446c1585d05ae2b641d8b8b4d