Merge "KeyMint VTS: add TEST_MAPPING" am: 7f366ab5dd

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1879916

Change-Id: I067aebeff0f1c730594812af451a7d24ea7b3b22