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

Change-Id: I8ed3f257509c721661299ce6047b73e983ceee87