Merge "UsbManager: Use resource IDs for notification IDs"