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

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



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