Merge "VibratorService: AIDL Amplitude API Change"