Merge "Revert "KeyMint VTS: add TEST_MAPPING"" am: 83e3bffe66 am: 0918368cf8

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

Change-Id: I9c4320af65a01073a49fb18e042f4d7b055ef790