Merge "HFP: Audio/Connection state was updated reversely when cleanup" into p-keystone-qcom