Merge "CSD: enable CSD for BT devices" into udc-qpr-dev am: bc7b03159b am: ea63ad62e2

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

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