Merge "Update the A2DP Codec Config API"
am: 451a32cb56

Change-Id: Idec7f69d45c559a4f0e482c273d0964f2948aa0c