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

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

Change-Id: I283e076e67390a195e95c6ed5c7ca004c42a9e9a