Merge "Nav haptics: increase threshold to 150 and don't do on long clicks" into oc-dr1-dev
am: ac73492ca5

Change-Id: I215bbc6f67a678cc8289c77736d059fe78e4837f