[automerger skipped] Merge "CSD: Add possibility to select the BT audio device...

[automerger skipped] Merge "CSD: Add possibility to select the BT audio device type" into udc-qpr-dev am: ba84bc8b am: 96adf906 -s ours

am skip reason: Merged-In Ia54e141a09b7c95f43b59bab1445eb08890383b3 with SHA-1 2ea196af is already in history

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



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