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

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

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



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