Merge "Make vibrator test consistent with HAL definition" into oc-dev am: 1fda916dce
am: d9d260112f

Change-Id: Ic63b30913a731de04eee6cb710a8fbafdcbf8f81