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

Change-Id: I3eca0e40a5226a6e4cb963f0458ed85b85d60aac