Merge "cargo2android: reorder TEST_MAPPING statements" am: 7534ce72da

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

Change-Id: I39a2baccb693fc7dfa4201e8c7e07c81bbc4c0b8