Merge "Revert "KeyMint VTS: add TEST_MAPPING""