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

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

Change-Id: I7e181585e75e74e1803f874bd4bdf30fb0344566