Merge "UsbDebuggingManager: Add interface to clear secure adb keys"