Android Security 11.0.0 Release 62 (9269287)
Merge cherrypicks of [20050132] into security-aosp-rvc-release.

Change-Id: Ic7b50cc65afce966ee49c58e514c741c2dae4a24