Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 007c81710a am: bdfe1e91c0

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

Change-Id: Ica660dd6d1bdfc44cf31b08a18368dc896a5729c