[automerger skipped] Merge changes from topic "vibrator-hal-1.4-vts" am: 3ff034b3e1 am: d3d760716e am: 5217766c49
am: 36ffbe0372 -s ours
am skip reason: change_id Ibaf3072a38b32b159d7b48a40860a25928c5d6f1 with SHA1 eabbe5d1bb is in history

Change-Id: I30198e2be07a44b356db522cfa7157e140fa4484