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

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

Change-Id: I5b8fe1b7c09a88487d8e28c5cf12bbe797a782aa