Merge "CSD: Remove A2DP devices for CSD calculation" into udc-dev