Merge "Simplify patch by not passing cargo_pkg_version." am: ac3fe15122 am: dc4394cb86 am: f372202805 am: 66b7f2d794

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/grpcio-sys/+/1838343

Change-Id: I6e76963fac45377d7cbc8100edcf84780bc2ccd2