Merge "Update the A2DP Codec Config API" am: bd298a7a50 am: 96dda78d24 am: 6fbaebd7e8
am: 502de2cfa2

Change-Id: Ib894f4f4f2587cda27cdf6c4e3dba70a7fdbc0d0