Merge "Update the A2DP Codec Config API"