[automerger skipped] Merge "Correct stream type for BLE input device" am: 2c7275d641 am: 41fa371e64 -s ours
am skip reason: Merged-In I0dc289d9b670133928513aa5e5c1edd240351aef with SHA-1 961bc806e0 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2089446
Change-Id: Ic7957772d080d240f01345225468ec8136dabeda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: