Merge "audiopolicy: modify A2DP suspend logic"