Merge "adb: Allow disabling verity on eng builds when using AVB." am: 7ce0f00c08
am: 1ceea342d5

Change-Id: I000b7f411fef7e3b7c170493b94078ff7c5c3f34