Merge "VibratorService: Fix Typo in AIDL Perform Effect" am: 1a0e1bae27 am: fb0e76110d
am: 533db782b9

Change-Id: I04e14f995fd2325cc2b9d207ec977136d86be2b6