am a79c8291: Fix to get A2DP to connect after unpairing

Merge commit 'a79c82918e3df38197cd4c81d10049401485036e' into gingerbread-plus-aosp

* commit 'a79c82918e3df38197cd4c81d10049401485036e':
  Fix to get A2DP to connect after unpairing