Merge changes from topic "rust-tests-and-mappings-refactor" am: 79b55eadb6 am: ebb900bb66

Original change: https://android-review.googlesource.com/c/platform/development/+/1918446

Change-Id: If85737e11e49d3f4c710487fb78b05e5ecf9205b