Merge "AudioService: strengthen A2DP device detection" into ics-mr1