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

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

Change-Id: I5114dfd6a5c4c29f04930695106a39a369a4c568