Merge "Update TEST_MAPPING" am: 0dcc8b47c3 am: 4a119da3f5 am: cfb1a4bc37 am: e824a896d9

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/thread_local/+/2125713

Change-Id: I2687a55776e71395d7db2292995398ccdd90799e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>