am 9f1d9c16: (-s ours) Merge change I9a1ed7e4 into eclair

Merge commit '9f1d9c16887d2bdebce65ceb1ac80e1fedd9ef48' into eclair-mr2

* commit '9f1d9c16887d2bdebce65ceb1ac80e1fedd9ef48':
  Update to reflect new priorities for A2DP profile. DO NOT MERGE.