Merge "A2DP: Do not Set already active device active again" into p-keystone-qcom