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

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

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