Merge cherrypicks of [14131886, 14130974, 14131039] into security-aosp-rvc-release

Change-Id: Ic1e4945b6845e373266ee8219806827bbb64d7af