Merge "Revert "pm: Apps with shared UID must also share selinux domain""