Merge "adb-remount-test: Simplify disable-verity setup"