Merge "Add a mechanism for configuring the A2DP Source codecs" am: 2b4315b859
am: 44df1b76e6

Change-Id: I20b2d9ad0b1d45767098bbca39ba0219df9175e5