merge: run cargo2android.py am: 58c27aa1e7 am: fc5b3000a7

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/merge/+/2338532

Change-Id: Ic31de865af09b9d4148c987efff01b00213e3c37
Signed-off-by: Automerger Merge Worker <[email protected]>