Merge "adb: Support 'adb enable/disable-verity' when using AVB." am: 8fc6cc8910
am: 2b3a568171

Change-Id: I59cbbdaf00664f17cf04ee56c10f836e8daff0ab