Merge "Make android.hardware.usb.action.USB_ACCESSORY_DETACHED..."