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

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

Change-Id: Ie0c7d08b2570a0225653c0cad63f834e965637a3