Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 733e7baa10

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

Change-Id: Ibef4294f1659d0d56f12a8582954c058d49fc9db