[automerger skipped] Disable deep press when long press timeout is long am: 1a683cebe3 -s ours

am skip reason: Change-Id Ic631c684609c4436e9eaa6f9389939c5a6e4e1cd with SHA-1 c60da19f2a is in history

Change-Id: I1e8015f449b4f68da7975f5ca3b0f148ce70ce4e