Merge "Don't reset audio route if setBluetoothScoOn is called without SCO connection" into p-keystone-qcom