Merge "Try BT audio connection one more time before failing"
am: 48a05407ec

Change-Id: I8934d5ee2e2e968f8b4a928270f2d18b6deb7936