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

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

Change-Id: Ic45fe08f5be6f80a9578295e65ed0edc91e80e84