Android security 11.0.0 release 63
Merge cherrypicks of [16549692, 16549693] into security-aosp-rvc-release.

Change-Id: I68c28f8614f38d85e6add0ffe9cff66eeb201198