Merge "Update TEST_MAPPING" am: 2ee5fcd5f3 am: 23653063a4

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

Change-Id: Ie1cd1111ad018a590047d467ef88a467d331cb19