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

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

Change-Id: I507a2d5e116e6f77ee1746114b0b924317ae5017