Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 91dcd9888d am: b340e65226

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/thiserror-impl/+/1912689

Change-Id: I529491ff85c84eafa2ef801531f678c1fca56559