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

Change-Id: I9369f18c88d8f64b5dfea28245bf102e647db31f