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

Change-Id: I11c513170ce02a7cd6ef5c4cf6e1230e7b60e5ea