[automerger skipped] Disable deep press when long press timeout is long am:...

[automerger skipped] Disable deep press when long press timeout is long am: 1a683ceb -s ours am: 0ca2209e -s ours am: 2a84d907 -s ours am: bd0b49f2 -s ours am: 146b2202 -s ours am: 8c646077 -s ours

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

Change-Id: I2e44eeaa51be638f0e83aea5490ac96d004a0880