Merge changes from topic "am-c3548d64-0940-4c1d-b786-8c3f6bfc3870" into oc-mr1-dev

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