Merge "Correct stream type for BLE input device" into tm-dev am: 8f114162...

Merge "Correct stream type for BLE input device" into tm-dev am: 8f114162 am: da9f8303 am: dce7dda3 am: 7db6d5c2

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



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