Merge "adb-remount-test: Refactor remount -R & disable-verity test"