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

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

Change-Id: Ic2d9051445575fce6e451d9919d07a4fd42d3211