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

Change-Id: I37f2a4134ba6cae182093856a7d669464c457712