Merge "adb: checks device state when using adb disable-verity for AVB"