Merge "Do not write out the --no-test-mapping option." am: cedb102822 am: 3b014257fa

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

Change-Id: I2a621de7c298ebc6bb3a59ceab42c9876d7a1173