Merge "Deflake InterceptKeyIfKeyUp" into udc-qpr-dev am: cc65a9ccbc

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

Change-Id: Ic383a0e5d87fbb1b9fdf9573bc02e5be6a7329bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>