Merge "Do not generate cargo_pkg_version when --no-pkg-vers is passed" am: f78de4f942 am: 9bbb76e144

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

Change-Id: I472346fc36bd996b6e2fdcb0ced83a7d993bb85d