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

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

Change-Id: I44cd773dccca82a4cb1949f3a57c2bcf7d06cbc9