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