Merge changes from topic "am-ef87c1d2-519f-467f-b097-802ff59b63b3" into ub-launcher3-master

* changes:
  [automerger] Remove haptic on touch down Bug: 65463659 am: d315ff2bc2
  Remove haptic on touch down Bug: 65463659