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

Change-Id: I36b3f1ae8f7cbdbae440cc26b08946851a84313e