Android security 11.0.0 release 59
Merge cherrypicks of [18993507] into security-aosp-rvc-release.

Change-Id: I4e3b150d27093cecdc4fbfd7c9c0e5408c281053