Merge "A2DP: Remove setActiveDevice on conn state change in a2dp service" into p-keystone-qcom