Merge "Remove UserId from UID when checking against BLUETOOTH_UID"