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

Change-Id: Id14ae766e494e823a8ac764e78ff719fc0a12354