Merge "SCO: Resume A2DP when call ended and SCO is not connected" into pi-dev