Android Security 11.0.0 Release 55 (8287685)
Merge cherrypicks of [16622627, 16790556] into security-aosp-rvc-release.

Change-Id: I3ddf65abf59d6b5cde29f97513536c0b331178fa