Merge "Update TEST_MAPPING" am: d6c243694a am: 5bbf7d7c3a am: 7a7a52e2fe am: 84c6c99041 am: 1c2c0f9edc

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

Change-Id: Ie7745610088b55d69901e8358df4b4f5d52389fd