Merge "Remove device from  A2DP or  HF retry set" into p-keystone-qcom