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

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

Change-Id: Ia2986f55ee31fc59d2928240955cb3cce5b09756