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

Change-Id: I11db272b8489178e8005f8e1f93938a6e252c703