Merge "InputDevice.hasKeys also checks for key usage" into udc-dev am: 216dd8503b am: e6a2a6c814

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

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