Merge cherrypicks of [14193815] into security-aosp-rvc-release

Change-Id: I7503522ec252f23439ca1470cbfec41361298cd7