Merge "Don't set BT_SCO=off from HFP during BT off" into q-keystone-qcom-dev