[automerger skipped] Merge "Stylus fusion: Use SOURCE_BLUETOOTH_STYLUS...

[automerger skipped] Merge "Stylus fusion: Use SOURCE_BLUETOOTH_STYLUS dynamically for events" into udc-qpr-dev am: 6d86aa2d am: 3bb74671 -s ours

am skip reason: Merged-In I3526d42df68bc899c8e9a0e5ad69c95864f4c325 with SHA-1 b08a0e84 is already in history

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



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