Merge "Revert "Enable verity on userdebug, and add disable-verity to adb"" into lmp-mr1-dev