Merge "Vibrator service -> .bp" am: 3a8a6f9147 am: 08853ff3ae
am: 81399a45d3

Change-Id: I55f802eee986655f84fd2cc049c6dc49e3c03db8