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

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

Change-Id: I9f634f21ba4ff097f404a2f6347d57f67ffc19d6