Merge "VTS: fix VtsHalKeymasterV3_0Target issue am: af5fad4036  -s ours am: 2af656a3ea" into oc-mr1-dev