Merge "adb: checks device state when using adb disable-verity for AVB" into pi-dev
am: 8dca85f0c8  -s ours

Change-Id: I0f6cebbfd169276a449accf5bf7f3c747733509b