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

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

Change-Id: I2db42c7c96679d7833ecfb7c63b88c1139edb7c2