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

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

Change-Id: Icc9d40d9507cd6a9ba3b31f6144e4b3a37329008