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

Change-Id: I84768c516232d6f5921f5a5d43f9aa169128ca58