Merge "InputDevice.hasKeys also checks for key usage" into udc-dev am: 216dd850 am: 1d4d94b6

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



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