Merge "VTS: fix VtsHalKeymasterV3_0Target issue"