Merge "vibrator: Add Composition APIs" am: 91b14d539d
am: 3842f50ad6

Change-Id: I3cd70fc6d1d447f594a58ee358189a69720091c0