Fix more of the vibration duration cherry-pick for omni

Change-Id: I1a5cfd4421fdf1779803f78dc8f2eec3f50ffe2a