Merge "Update TEST_MAPPING" am: bc30d025d5 am: 3bb665b845

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

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