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

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

Change-Id: I0943ff012fd6a4daab295f6ded5653970543f6cb