Merge "Add a cargo2android flag to disable generating TEST_MAPPING." am: 4d82acfeee am: 4c0bf9ff7b

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

Change-Id: I088da12a08116d792814cce74aeb9c4e6f7cb49e