Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: f0688e4a35 am: 6f2675cf48 am: 6c59619546 am: 170ba3ee2d

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/oid-registry/+/1912611

Change-Id: Ia28270a7172271b9967f79a9a512e792907c29b9