Merge "rust: Add support for more cargo pkg version vars" into main am: f74612e3 am: 3a50b050

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2679918



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