Merge "Update the A2DP Codec Config API" am: ccd60f7cbe am: f0096fb868
am: 91707989c4

Change-Id: I0d58681de89b82ffdce57d3381cd2397b9ade3e7