Merge "VibratorService: AIDL Amplitude API Change"
am: 081e49f276

Change-Id: I4c7b7e1056833095b3bb8f7e3f7e472ddc2962e1