[automerger skipped] Merge "Add test to ensure a keyboard with HID usage support is not a stylus" into udc-qpr-dev am: fbf50da5f3 am: d1b06dd0fe -s ours

am skip reason: Merged-In I8a3565a827fe183997573f685110805e5b5bc306 with SHA-1 37a819b8cd is already in history

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

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