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

Change-Id: I28c437bd5b578c37db101cdb1c948c37574c0556