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

Change-Id: I6479a768c3d6308452f9fa837a3b9917b91fd09e