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

Change-Id: I4bddfbeeeac384fb8fa7d7a16cfcf8922c21f71d