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

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



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