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

Change-Id: I2a3946408b9543dfd40343698161a64eebf54277