Merge "Fix vibrator VTS failure on older HAL versions" into sc-dev