aml_tz4_332714070 (11568890,com.google.android.go.tzdata4,com.google.android.tzdata4)
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 4d183ff2a6 am: 7e589d6583 am: ac359e0e56 am: 46a0cad69d

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

Change-Id: If62124b99ed2945af36b8aa76a7d46b3bbe34e16