Merge "Remove name appendix of .TEST_CONFIG" am: a8c96bfffe

Original change: https://android-review.googlesource.com/c/platform/build/+/1406416

Change-Id: Ib9a774d64bd2965104802f2f96db6f48f9b92fe9