Merge "Update TEST_MAPPING" am: 2fd73219ce am: 55cb1a0354 am: 364d1f084e

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

Change-Id: I699689eac8b564bc298ab0670a3e3962a439b3dc