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

Change-Id: Ie122334215a75017da395c7d2e42b9e3131a509d