Merge "Update TEST_MAPPING" am: 6ac831e424 am: 9fb29a9dcf

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

Change-Id: Id6cb6f3a912ca669e2228ff4a73ad3cd858451d2