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

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

Change-Id: Ie32a841a742d2d2f55db578c5b05c471f9cb112d