Merge "Fully remove deprecated --no-test-mapping argument." am: 52469f2093

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

Change-Id: Icdc72b87817fcaf3b8ce69c0b240ec0aec1c5335