Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: e092e401eb am: d7bbc3735b am: fc794a63cc

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

Change-Id: Id1031edbc88950df009cad5e663e6e343e919aee