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

Change-Id: I030049c206492ebc980a4080804f8d3e290b6487