Merge "Simplify patch by not passing cargo_pkg_version." am: ac3fe15122

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

Change-Id: If7fd66b079b7c9125e9361b5725ed748a5467035