Merge "vibrator: Add Composition APIs"
am: 677cdb4b0e

Change-Id: I359fc3ba7d10b926b807e1f1bafdd632967d0b85