Merge "Add haptic constants" into pi-dev
am: ef5bb6fd70

Change-Id: Icf8e02837fe504284b3dfc86bef0165f272dad66