Merge "Nav haptics: increase threshold to 150 and don't do on long clicks"...
Merge "Nav haptics: increase threshold to 150 and don't do on long clicks" into oc-dr1-dev am: ac73492c am: 340e7d25
am: 97675b46
Change-Id: I645a0f9a9c51ce0a18cd00f776ede00cb937eb6b