Merge "Move TEST_MAPPING out of tests/ subdirectory" am: 8efb5832bb

Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/1878323

Change-Id: I066064d3c9091cbc2ce0f6a928397600b4aee9da