Merge "Add persistent permissions to `dumpsys usb`"