Merge "Add a mechanism to configure the default A2DP codec priorities" am: a82ee04b92
am: adf704ce29

Change-Id: I9ebe63d07e486f0033765236a1d61e8a16989595