Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 733e7baa10 am: b07611c07c am: 3c9932ff16 am: 676c379a13

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

Change-Id: I56f3be0e3895e2121f27dba4d696363912c940ab