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

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

Change-Id: Iee5313896c281c69d1bda6e13b36fcfd661540c3