Merge change 22870 into eclair

* changes:
  Set Routing to A2DP only when state is Connected.