Merge "Update TEST_MAPPING" am: 66a4bfccd7 am: 6b65f9231b

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

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