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

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

Change-Id: I8627802cbba1e757c5049379b52e1e6ffd4eecc3