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