Android security 11.0.0 release 63
Merge cherrypicks of [17008934] into security-aosp-rvc-release.

Change-Id: Ifd02386608de99796fc928958d56a981df55aed4