Merge "Keymaster VTS: add TEST_MAPPING" am: fce05decfc am: 5721b05a66

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

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