Merge "frameworks/base: usb: Add enableUsbData to dumpsys commands" into main