Merge "audioservice: do not resume a2dp after sco reset if a2dp is disconnected" into p-keystone-qcom