Merge "Keymaster VTS: add TEST_MAPPING" am: fce05decfc

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

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