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

Change-Id: I8ce276208b39618d7ff2c46a5cca5a2356633d6f