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

Change-Id: I17b6e5618ae01e96f94685c131e1008e6e942f33