Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: d9afb2fc55 am: 0802197df7 am: e5c0d5b4c8 am: a4a2a1577a

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/criterion-plot/+/1912003

Change-Id: I9b0a33b8629418d2376ce1ed5d9bacf899edcb5f