Merge "Don't try to remove Cargo.lock if it doesn't exist." am: fa51a80114 am: a9136a088c

Original change: https://android-review.googlesource.com/c/platform/development/+/1938733

Change-Id: Ic02d88ecd99b8a4618cfbfe3e7e9da79d4ada32c

scripts/cargo2android.py

@@ -1370,7 +1370,8 @@ class Runner(object):
     os.environ['PATH'] = saved_path
     if not self.dry_run:
       if not had_cargo_lock:  # restore to no Cargo.lock state
-        os.remove(cargo_lock)
+        if os.path.exists(cargo_lock):
+          os.remove(cargo_lock)
       elif not self.args.use_cargo_lock:  # restore saved Cargo.lock
         os.rename(cargo_lock_saved, cargo_lock)
     return self