Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 96e6fc6ec8 am: 39ea0828a7 am: e9545a4bd3 am: cc9b9bcd97

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

Change-Id: I296f031591a4ecb3365fe7c539fa65d928c3c2ab