Merge "Sort Rust TEST_MAPPING tests." am: 74039da0ef

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

Change-Id: I67169dde306fbb1c77e7c6dc541857f3bbf4e32f