Merge "Fix permission check in car-usb-handler"