Merge "Keymaster VTS: add TEST_MAPPING"