Merge "CSD: Remove a2dp for safe volume index devices" into udc-dev