Merge "adb: Fix secure adb when booting with usb attached"