Merge "Handle duplicate DOWN event" into sc-qpr1-dev am: 6ce3c76c24 am: aa9afafcaa

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

Change-Id: I7b5d4bcb18d00cc3f24f3b18c009c77a42bdaf2c