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

Change-Id: Icbd23a3fa8d7070be10789ca38cd1a817932de2a