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: 49a5ed1a
am: 7cc3efec
Change-Id: I5f1542a1b56810300f64ef1cc81d4f095ccc1c13