Merge "cargo2android: Fix edge case in --add_workspace feature" am: 4b4779ae81

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

Change-Id: I34dc1145ba925dfedd031755615f6926323a6cc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>