[automerger] VTS: fix VtsHalKeymasterV3_0Target issue am: af5fad4036 am: 349de81afa

Change-Id: Id7eb1efe28a1162e3c1f622aa98eda902f1bed15