Merge "Revert "Remove neverallow coredomain to set vendor prop."" into pi-dev