Merge "VTS: fix VtsHalKeymasterV3_0Target issue am: 926a8e7440 am: 7b770a8d70 am: 0564edd993  -s ours" into oc-mr1-dev-plus-aosp
am: b99dd49c0a  -s ours

Change-Id: I758b8f5c5cd4b93f06906319f70eb8eea52e7521