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

Change-Id: I3c71e27787efd5b9e381d7d6c3989a1889d48829