am f49b052d: am a79c8291: Fix to get A2DP to connect after unpairing

Merge commit 'f49b052d308bf4c2b5eb8daadf3559ea3fd68b8e'

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