Merge "Update TEST_MAPPING" am: 6ac831e424 am: 9fb29a9dcf am: 2e91b6e22e am: cfce2e7960

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

Change-Id: I150d0ce1074fe4af343c6c32941b9ddf25e3bedf