Merge "fs_mgr: adb-remount-test: non-verity recovery"