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

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

Change-Id: I41ccaf6b21eaf3d23067103c41fdfd6c2142cc8a