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

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-error/+/1912530

Change-Id: I399764a01bb9d7a3c6d361df088aca2efd6cf366