[automerger skipped] Merge "CSD: Add csd start/stop of BT categorized devices"...

[automerger skipped] Merge "CSD: Add csd start/stop of BT categorized devices" into udc-qpr-dev am: 94ef4389 am: f086e586 -s ours

am skip reason: Merged-In I161533a38cb718c28a8c5a8eaf962e0e5055b5a1 with SHA-1 f79f6bab is already in history

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



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