Merge "UsbManager: Remove redundant Intent extras from USB device and accessory broadcasts"