Merge "adjust  haptic feedback test for device without vibrator" into jb-mr1-dev