Merge "Add a mechanism for configuring the A2DP Source codecs" am: 63270f2b96 am: 8b46f87e7e
am: da3de76bdb

Change-Id: If62a29812dad856d262c38804f3d88a5406ef79e