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

Change-Id: If5c40282501dfc4b654507dbd2a7016da3247459