Merge changes from topic "vibrator-hal-1.4-vts" am: 3ff034b3e1 am: d3d760716e
am: 5217766c49

Change-Id: I7aa2f64f0babbdd3537602651c6319de9bce910e