Merge "cargo2android: Improve package version logic" am: e203a54627

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

Change-Id: I4dc4c87634958069fcf1c99b7305e14e920c910c