Merge "Reset intercept key wake time when receving up event" into tm-dev am: b0237800 am: b2dbcc8e

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/17068927

Change-Id: Id0794ee9c19959ea6a4eecfc10b6b902b5072740