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

Change-Id: Ib050779118c162f4de44f17274369400dba79a11