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

Change-Id: I1fcc37af08200d7898be2da7f85b45abb4177e78