Merge "Update TEST_MAPPING" am: d6c243694a am: 5bbf7d7c3a am: 7a7a52e2fe

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/async-trait/+/2004426

Change-Id: I4289e77aed984cd29f0d65123d316f97b7763dff