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

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

Change-Id: Idf1cd131c88b00e4e17403cfac87a0f4165eac5c