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

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

Change-Id: I6916157eddf577474f2bc6f7c356c737632dffe8