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

Change-Id: I40ba40f251f2fe0a0bb47f9704682442b6e23a32