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

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

Change-Id: I056b0757490720238b1748c5f8a67c088daac8d8