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

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



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