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

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

Change-Id: I6dc8fc384d74f18d2970a8f7ad7b106408393ea6