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

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

Change-Id: I7d6a14e71eda4462a7de034f4538fe05ecc2854a