Merge "Update TEST_MAPPING" am: cc07a56915 am: 8bd8954f80

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

Change-Id: Ia3e42cf17f6c039676abfddf95d74e8467d5b162