Android security 11.0.0 release 65
Merge cherrypicks of [20028194] into security-aosp-rvc-release.

Change-Id: I496fc02afebfb6775c7ffab1186eefe5eed78313