[automerger skipped] Merge "Correct stream type for BLE input device" am:...

[automerger skipped] Merge "Correct stream type for BLE input device" am: 2c7275d6 am: 41fa371e -s ours am: 8a949f8c -s ours am: 3725b193 -s ours

am skip reason: Merged-In I0dc289d9b670133928513aa5e5c1edd240351aef with SHA-1 961bc806 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2089446



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