Merge "Keymaster VTS: add TEST_MAPPING" am: fce05decfc am: 5721b05a66 am: 8ca0d0f7be am: 779971ccee

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

Change-Id: I4b68237c816f06a59e4305af6629f2d04f96f37f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>