Merge "UsbDeviceManager: Fix typo that broke adb on/off setting persistence"