Merge "Update the A2DP Codec Config API" am: 451a32cb56 am: 6c3ad4427f
am: 28124d4384

Change-Id: I8912291f2ae40c4cf654cbf2cc1ff53fe2908c29