[automerger skipped] Merge "Default vibration amplitude resolution added" into pi-dev am: 39cfdf1325
am: 94babdc406  -s ours

Change-Id: Ida4ec2185336a0c27fc3baf0e71e9f52ea9180b3