Use different USB PIDs for adb and adb+ums modes

adapted from @kumajaya
selinux: Remove redundant policy

adapted from @kumajaya