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

Change-Id: I797aa8fd3408354639fda80c1418afec47241893