Android security 11.0.0 release 61
Merge cherrypicks of [16422896] into security-aosp-rvc-release.

Change-Id: I48e6acc4d9434b8168f63dc3ec1fa4355cccc3bc