Merge "Don't throw exceptions if HFP, A2DP services are started again" into p-keystone-qcom