Merge "CSD: Remove A2DP devices for CSD calculation" into udc-dev am: 3cdcceb0 am: 065906e8

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



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